git mergetool
命令手册Run merge conflict resolution tools to resolve merge conflicts. More information: https://git-scm.com/docs/git-mergetool.
git mergetool
git mergetool --tool-help
git mergetool --tool {{tool_name}}
git mergetool --no-prompt
merge.guitool
config variable):git mergetool --gui
merge.tool
config variable):git mergetool --no-gui